<html>
<body>
<script src=hello.js></script>
Hello Mathbiol! Hello Everyone. CHANGE!!
<p>Hello back from Jonas !</p>

branched out to my own (jonas)
<p>lala ;-)</p>
here another Jonas trying to stay out of branching
<p>Please unmerge me, I want to branch out</p>
Maybe lets keep edits is an ordered list so we can track them
<ol>
<li>local diff</li>
<li>edited in googlecode web page</li>
<li>edited locally, lets try to cause a conflict right afterwards</li>
<li>failed to cause conflict, trying again, this time from googlecode</li>
</ol>
</body>
</html>
